Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Thu, 11 Mar 2010 10:05:39 +0000 (11:05 +0100)
committerJan D. <jan.h.d@swipnet.se>
Thu, 11 Mar 2010 10:05:39 +0000 (11:05 +0100)

Trivial merge